Merge "[automerger skipped] Merge "Address nit from aosp/1301317" into rvc-dev am: 75fddad9b4 am: 07b69e4658 -s ours" into rvc-d1-dev-plus-aosp am: 6d1ff7dc30 -s ours am: 14935b8fc6 -s ours
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 436608cf39 is in history
Change-Id: If5618d2d97de0a8257d562265f1254de6c5dabfe
This commit is contained in: