Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f

Change-Id: I72c59082dc7d9c33dfd546c588b8df1b96056191