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

Change-Id: I544a7b4a5c24186d675377ee64945d32ffe0a628