Merge commit 'faca7c1efd28507258d47831423e88265a86773d' into HEAD
am: ae68e07e99

Change-Id: I3999730be03e6ef9976400749a87fb105da4debd