Merge remote-tracking branch 'joel/master' into mymerge
am: d21a65fba1

Change-Id: I513c47d142615faab57e67ed3d3ca8c1f40bd15e