Merge (ignore) from open-source master tree

Change-Id: Ie735c3282ddc17c1e28e1069b714f3a310c221a2