Also a few small bug fixes and tweaks. Bug: 8697117 Change-Id: If6e4f77df8e5c1cb09dddc4da5105ec050181c55
Attach a file by drag & drop or click to upload
