Bug: 148018766 Fix: 147568892 Test: make && make offline-sdk-docs Change-Id: I68d3de4beb500eaf0b462848ba18265a2702d191