Merge "Fix build due to no explanatory comment."
am: 0b6c77167e

Change-Id: Icc0a8be233ab0a5f5f86541b452ae82e6415fd4c