Android O MR1 IOT Release 1.0.13 (5612681)
Merge "Add product manifest and fragments."
am: cf76f0a81f

Change-Id: Iab0a13add3728acca00ae104938ce27873a6bd87